babl/babl-component.h babl/babl-conversion.h babl/babl-extension.h

2009-01-18  Sven Neumann  <sven@gimp.org>

	* babl/babl-component.h
	* babl/babl-conversion.h
	* babl/babl-extension.h
	* babl/babl-format.h
	* babl/babl-model.h
	* babl/babl-type.h: allow to disable the defines that were added
	for backward compatibility by definining
BABL_DISABLE_DEPRECATED.

	* babl/babl-image.h: removed trailing whitespace.

svn path=/trunk/; revision=384

diff --git a/ChangeLog b/ChangeLog
index 4bbb8408ceb96322a2b7328822d8610b35437d4c..320da45eb12f895f93e39442e83eab58f56744c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-01-18  Sven Neumann  <sven@gimp.org>
+
+       * babl/babl-component.h
+       * babl/babl-conversion.h
+       * babl/babl-extension.h
+       * babl/babl-format.h
+       * babl/babl-model.h
+       * babl/babl-type.h: allow to disable the defines that were added
+       for backward compatibility by definining BABL_DISABLE_DEPRECATED.
+
+       * babl/babl-image.h: removed trailing whitespace.
+
 2009-01-17  Martin Nordholts  <martinn@svn.gnome.org>
 
        Add #define babl_foo babl_foo_from_name macros, that should fix

diff --git a/babl/babl-component.h b/babl/babl-component.h
index fe8b353a2a3928f815192e7338fe5173b19ec4e9..f6066e320aba253c5dd781d588233f35cab268a9 100644 (file)
--- a/babl/babl-component.h
+++ b/babl/babl-component.h
@@ -17,7 +17,7 @@
  */
 
 #ifndef _BABL_H
-#error  this file is only to be included by babl.h 
+#error  this file is only to be included by babl.h
 #endif
 
 
@@ -29,8 +29,13 @@ BABL_NAMED_CLASS_DECLARE (component);
  *                            NULL);
  */
 
+#ifndef BABL_DISABLE_DEPRECATED
+
 #define babl_component babl_component_from_name
 
+#endif /* BABL_DISABLE_DEPRECATED */
+
+
 typedef struct
 {
   BablInstance     instance;

diff --git a/babl/babl-conversion.h b/babl/babl-conversion.h
index 2e15fef2f7cb7ea595cc25975ba1c7fef3527ed7..0cfed8205be4d452045092c6fa529b7964c32407 100644 (file)
--- a/babl/babl-conversion.h
+++ b/babl/babl-conversion.h
@@ -17,7 +17,7 @@
  */
 
 #ifndef _BABL_H
-#error  this file is only to be included by babl.h 
+#error  this file is only to be included by babl.h
 #endif
 
 /****************************************************************/
@@ -31,8 +31,13 @@ BABL_NAMED_CLASS_DECLARE (conversion);
  *                              NULL);
  */
 
+#ifndef BABL_DISABLE_DEPRECATED
+
 #define babl_conversion babl_conversion_from_name
 
+#endif /* BABL_DISABLE_DEPRECATED */
+
+
 /* Type and Format */
 typedef long (*BablFuncLinear)    (char  *src,
                                    char  *dst,

diff --git a/babl/babl-extension.h b/babl/babl-extension.h
index 6aaf6d7ad0c55666a351c0884e9bfb6a1b1caa5d..3f1ca3460036c80ca640d1e2a225579bb894ae9b 100644 (file)
--- a/babl/babl-extension.h
+++ b/babl/babl-extension.h
@@ -17,7 +17,7 @@
  */
 
 #ifndef _BABL_H
-#error  this file is only to be included by babl.h 
+#error  this file is only to be included by babl.h
 #endif
 
 /****************************************************************/
@@ -27,8 +27,13 @@ BABL_NAMED_CLASS_DECLARE (extension);
  * BablExtension objects are only used internally in babl.
  */
 
+#ifndef BABL_DISABLE_DEPRECATED
+
 #define babl_extension babl_extension_from_name
 
+#endif /* BABL_DISABLE_DEPRECATED */
+
+
 typedef struct
 {
   BablInstance   instance; /* path to .so / .dll is stored in instance name */

diff --git a/babl/babl-format.h b/babl/babl-format.h
index 05c74cfa22737ef9f30ecd234a910b2cff5fc599..90da767e6062b29d87a11dae2024f9b1df509d9d 100644 (file)
--- a/babl/babl-format.h
+++ b/babl/babl-format.h
@@ -41,8 +41,13 @@ BABL_NAMED_CLASS_DECLARE (format);
  * name is used.
  */
 
+#ifndef BABL_DISABLE_DEPRECATED
+
 #define babl_format babl_format_from_name
 
+#endif /* BABL_DISABLE_DEPRECATED */
+
+
 typedef struct
 {
   BablInstance     instance;

diff --git a/babl/babl-image.h b/babl/babl-image.h
index a7ca108fc601b4ac8e2c507b76d9d15e1c1f0d44..efc41fe0e885d84a7e811ec3200e0d51d455c760 100644 (file)
--- a/babl/babl-image.h
+++ b/babl/babl-image.h
@@ -17,7 +17,7 @@
  */
 
 #ifndef _BABL_H
-#error  this file is only to be included by babl.h 
+#error  this file is only to be included by babl.h
 #endif
 
 /****************************************************************/
@@ -29,7 +29,7 @@ BABL_CLASS_DECLARE (image);
  * passed to babl_process, two different babl_process() functions will be
  * needed for this since the polymorphism cannot be trusted to work on linear
  * buffers that originate outside babl's control.
- * 
+ *
  * Babl * babl_image_new (BablComponent *component1,
  *                        void          *data,
  *                        int            pitch,

diff --git a/babl/babl-model.h b/babl/babl-model.h
index 9d9b2e281d878e536f2e89f9d61876948e6177c7..844c9675b9205f44c370133840d78d353c47465f 100644 (file)
--- a/babl/babl-model.h
+++ b/babl/babl-model.h
@@ -17,7 +17,7 @@
  */
 
 #ifndef _BABL_H
-#error  this file is only to be included by babl.h 
+#error  this file is only to be included by babl.h
 #endif
 
 /****************************************************************/
@@ -34,13 +34,19 @@ BABL_NAMED_CLASS_DECLARE (model);
  *
  */
 
+#ifndef BABL_DISABLE_DEPRECATED
+
 #define babl_model babl_model_from_name
 
+#endif /* BABL_DISABLE_DEPRECATED */
+
+
 typedef struct
 {
   BablInstance     instance;
   BablList         *from_list;
   int              components;
   BablComponent  **component;
-  BablType       **type; /*< must be doubles, used here for convenience in code */
+  BablType       **type; /*< must be doubles,
+                             used here for convenience in code */
 } BablModel;

diff --git a/babl/babl-type.h b/babl/babl-type.h
index 314784f52a09baf44e0cca36bb3445897daed5c8..b1895822381aa322c571635950dc34d99fca730d 100644 (file)
--- a/babl/babl-type.h
+++ b/babl/babl-type.h
@@ -17,7 +17,7 @@
  */
 
 #ifndef _BABL_H
-#error  this file is only to be included by babl.h 
+#error  this file is only to be included by babl.h
 #endif
 
 /****************************************************************/
@@ -35,8 +35,13 @@ BABL_NAMED_CLASS_DECLARE (type);
  *                         NULL);
  */
 
+#ifndef BABL_DISABLE_DEPRECATED
+
 #define babl_type babl_type_from_name
 
+#endif /* BABL_DISABLE_DEPRECATED */
+
+
 typedef struct
 {
   BablInstance     instance;